import Vue from 'vue'
import Router from 'vue-router'
import Move_status from '@/components/move_status'
import Clips from '@/components/clips/clips'
import Circle from '@/components/circle'
import Mine from '@/components/mine'
<<<<<<< HEAD

=======
import Other from '@/components/other'
import Welcome from '@/components/welcome.vue'
>>>>>>> fd0af6f54de49667d27540bb468da0b53773cdf3

Vue.use(Router)

export default new Router({
  routes: [
<<<<<<< HEAD
     {

      path:'/',
      name:'clips',
      component:Clips

     },
=======
  	{
      path: '/',
      name: 'welcome',
      component: Welcome
    },
    {
      path: '/main',
      name: 'main',
      component: Main
    },
>>>>>>> fd0af6f54de49667d27540bb468da0b53773cdf3
    {
    	path: '/clips',
      name: 'clips',
      component: Clips
    },
    {
      path: '/circle',
      name: 'circle',
      component: Circle
    },
    {
      path: '/move_status',
      name: 'move_status',
      component: Move_status
    },
    {
      path: '/mine',
      name: 'mine',
      component: Mine
    }
  ]
})
